From 05c2c04e0dfbed4d5388fb7147078a99d687d4bb Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Mon, 1 Oct 2018 19:57:19 +0100 Subject: [PATCH] tools/libxl: Deprecate PV fields kernel, ramdisk, cmdline MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The PV fields kernel, ramdisk, cmdline are only there for compatibility with old toolstack. Instead of manually copying them over to there new field, use the deprecated_by attribute in the IDL. Suggested-by: Roger Pau Monné Signed-off-by: Julien Grall Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libxl/libxl_create.c | 19 ------------------- tools/libxl/libxl_types.idl | 6 +++--- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 580320d272..fe97eebdea 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -368,25 +368,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->shadow_memkb = 0; if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_DEFAULT) b_info->u.pv.slack_memkb = 0; - - /* For compatibility, fill in b_info->kernel|ramdisk|cmdline - * with the value in u.pv, later processing will use - * b_info->kernel|ramdisk|cmdline only. - * User with old APIs that passes u.pv.kernel|ramdisk|cmdline - * is not affected. - */ - if (!b_info->kernel && b_info->u.pv.kernel) { - b_info->kernel = b_info->u.pv.kernel; - b_info->u.pv.kernel = NULL; - } - if (!b_info->ramdisk && b_info->u.pv.ramdisk) { - b_info->ramdisk = b_info->u.pv.ramdisk; - b_info->u.pv.ramdisk = NULL; - } - if (!b_info->cmdline && b_info->u.pv.cmdline) { - b_info->cmdline = b_info->u.pv.cmdline; - b_info->u.pv.cmdline = NULL; - } break; case LIBXL_DOMAIN_TYPE_PVH: libxl_defbool_setdefault(&b_info->u.pvh.pvshim, false); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 2cceb8c057..3b8f967651 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -588,12 +588,12 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("rdm_mem_boundary_memkb", MemKB), ("mca_caps", uint64), ])), - ("pv", Struct(None, [("kernel", string), + ("pv", Struct(None, [("kernel", string, {'deprecated_by': 'kernel'}), ("slack_memkb", MemKB), ("bootloader", string, {'deprecated_by': 'bootloader'}), ("bootloader_args", libxl_string_list, {'deprecated_by': 'bootloader_args'}), - ("cmdline", string), - ("ramdisk", string), + ("cmdline", string, {'deprecated_by': 'cmdline'}), + ("ramdisk", string, {'deprecated_by': 'ramdisk'}), ("features", string, {'const': True}), # Use host's E820 for PCI passthrough. ("e820_host", libxl_defbool), -- 2.30.2